api/admin_views.py

@@ -21,11 +21,11 @@ from integral.models import SaleclerkSubmitLogInfo

                 from logs.models import ComplementCodeLogInfo, MchInfoEncryptLogInfo
              

                 from mch.models import AdministratorInfo, BrandInfo, ConsumeInfoSubmitLogInfo, DistributorInfo, ModelInfo
              

                 from member.models import GoodsInfo, GoodsOrderInfo, MemberActivityGroupShareInfo, MemberActivityInfo
              

                +from pre.custom_message import sendwxasubscribemessage
              

                 from statistic.models import ConsumeModelSaleStatisticInfo, ConsumeSaleStatisticInfo, ConsumeUserStatisticInfo
              

                 from utils.error.errno_utils import (AdministratorStatusCode, ComplementCodeStatusCode, ProductBrandStatusCode,
              

                                                      ProductCouponStatusCode, ProductMachineStatusCode, UserStatusCode)
              

                 
              

                -from pre.custom_message import sendwxasubscribemessage
              

                 
              

                 WECHAT = settings.WECHAT
              

                 
              
@@ -788,7 +788,7 @@ def member_goods_order(request):

                 
              

                     if good_type:
              

                         orders = orders.filter(good_type=good_type)
              

                -    
              

                +
              

                     if start_time and end_time:
              

                         start_time = datetime.strptime(start_time, '%Y%m%d')
              

                         end_time = datetime.strptime(end_time + ' 23:59:59', '%Y%m%d %H:%M:%S')
              
@@ -831,7 +831,6 @@ def member_goods_order_update(request):

                 
              

                     return response(200, 'Member Goods Order Update Success', u'会员商品订单修改成功')
              

                 
              

                -
              

                 def member_goods_order_batch_update(request):
              

                     brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
              

                     admin_id = request.POST.get('admin_id', '')
              
@@ -895,7 +894,7 @@ def send_trackingNumber_message(order_id, tracking_number, remark):

                         order.save()
              

                 
              

                         return True
              

                -    except:
              

                +    except Exception:
              

                         return False
              

                 
              

                 
              
@@ -1451,8 +1450,7 @@ def complement_code_list(request):

                         return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)
              

                 
              

                     logs = ComplementCodeLogInfo.objects.filter(status=True)
              

                -    
              

                -    
              

                +
              

                     if start_time and end_time:
              

                         start_time = datetime.strptime(start_time, '%Y%m%d')
              

                         end_time = datetime.strptime(end_time + ' 23:59:59', '%Y%m%d %H:%M:%S')
              

member/models.py

@@ -5,13 +5,13 @@ import json

                 from django.db import models
              

                 from django.utils.translation import ugettext_lazy as _
              

                 from django_models_ext import BaseModelMixin, upload_file_path, upload_file_url, upload_path
              

                +from jsonfield import JSONField
              

                 from shortuuidfield import ShortUUIDField
              

                 from TimeConvert import TimeConvert as tc
              

                 
              

                 from coupon.models import CouponInfo
              

                 from mch.models import ModelInfo
              

                 from simditor.fields import RichTextField
              

                -from jsonfield import JSONField
              

                 
              

                 
              

                 class GoodsInfo(BaseModelMixin):
              

miniapp/views.py

@@ -162,6 +162,8 @@ def mini_login_api(request):

                         saleclerk = SaleclerkInfo.objects.get(unionid=user.unionid, is_auth=True, status=True)
              

                     except SaleclerkInfo.DoesNotExist:
              

                         saleclerk = None
              

                +    except SaleclerkInfo.MultipleObjectsReturned:
              

                +        saleclerk = None
              

                 
              

                     if saleclerk:
              

                         user.phone = saleclerk.clerk_phone
              

requirements.txt

@@ -1,7 +1,7 @@

                 CodeConvert==3.0.2
              

                 Pillow==5.0.0
              

                 StatusCode==1.0.0
              

                -TimeConvert==1.5.1
              

                +TimeConvert==1.5.2
              

                 furl==2.1.0
              

                 isoweek==1.3.3
              

                 jsonfield==3.1.0
              

requirements_dj.txt

@@ -15,7 +15,7 @@ django-models-ext==1.1.10

                 django-multidomain==1.1.4
              

                 django-paginator2==1.1.3
              

                 django-query==1.0.6
              

                -django-redis-connector==1.0.3
              

                +django-redis-connector==1.0.4
              

                 django-response==1.1.1
              

                 django-rlog==1.0.7
              

                 django-shortuuidfield==0.1.3